projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 479b6a1 f2c3742)
Merge pull request #8487 from nextcloud/backport/8486/stable-3.16
authorJyrki Gadinger <nilsding@nilsding.org>
Fri, 25 Jul 2025 13:06:34 +0000 (15:06 +0200)
committerGitHub <noreply@github.com>
Fri, 25 Jul 2025 13:06:34 +0000 (15:06 +0200)
[stable-3.16] perf(activitylistmodel): store conflicts in a separate list


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.